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