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