Import all of the changes from master onto the new jsmime version.

--HG--
extra : amend_source : 6c882c6d091ba8e85b51a67d278540f491cd4de2