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