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