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