Change-Id: Ia1ac5e2480bc7dbee4ae4a7237a3d0f7427da015 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>