Allow index.htm files for directory roots
Merge remote-tracking branch 'origin/master'