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