dont uriencode everything
Merge branch 'doctran' into testing