Compatibility with uppercase file extensions
Merge remote-tracking branch 'origin/master/chiba' into master/chiba