Change-Id: I4f8402b863f929aed90384f119e49302a89c4cd2 Reviewed-by: Marco Bubke <marco.bubke@digia.com>