Merging my recent upstream fix  .js mimetypee