master
return correct file in dir if dir has same name as file (#6569)
Add support for `*.xhtml` files (#6854)