Change-Id: I284f814ac63eb489a6b0a39dce85008de742237a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>