Enforcing extensions for different media types
Merge remote-tracking branch 'upstream3/master'