Disallow empty index (HTML revision 8010)
auto-merge staging into master