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