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