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