merge from 3.2 - Add the missing quote_plus call. Fix closes Issue12924