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