Merge in changes to prevent autoindexing from breaking the server