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