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