encode urls being used as parameters
Merge branch 'maint-rel-1.6' into develop