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