Use ASCII URI where required #1645