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