Merge branch 'release/7.x-0.32' into develop
BUG 17887: url encode values
handle url encoding in options list
version 7.x-0.33
Merge branch 'release/7.x-0.33'