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