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