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