Merge "Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes" into jb-ub-mail-ur10