Collapse adjacent =??B? words losslessly

Cherry Picked: b832faf6d05f85422dd921d3b97ed842436f22a8

This issue broke our code base when we upgraded to rails 3.2.16. Currently we're using a local fork, but I thought that this should still go into 2-5-stable as a patch.

Richard