Merge "Make all QUnit tests pass for languages other than English"