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