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