Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_geturl