Remove a file accidentally committed in June
Merge branch '2.1-maint'