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