Updated in response to comments from @hunner
Merge branch 'directoryindex' into all_features