merge from 3.3. Minor urllib.parse.rst docs fix.