merge from 3.3

Improve urlencode docstring. Patch by Brian Brazil.
Closes issue #15350