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