MDL-23980 importing latest 1.3dev - this should fix the url encode problem