Revert "Merge remote branch 'upstream/master'"
Revert "Merge remote branch 'upstream/master'"

This reverts commit 6d653ea71008625fc25ac1375989cf2f70296161, reversing
changes made to 02066a511adcad08bb05d7a4a36ca1fc9ca08805.

vinoski/mochiweb,ubf/mochiweb,robertkowalski/mochiweb,jasonjli/mochiweb,rcouch/couchdb-mochiweb,danogwok/mochiweb,rabbitmq/mochiweb,tsingpan/mochiweb,vinoski/mochiweb,tsingpan/mochiweb,riak-synrc/mochiweb,jasonjli/mochiweb,GOFactory/mochiweb,kuenishi/mochiweb,danogwok/mochiweb,GOFactory/mochiweb,rabbitmq/mochiweb,heroku/mochiweb,mdg/mochiweb,ubf/mochiweb,robertkowalski/mochiweb