Reinstate files that were erroneously deleted during the release.
Merge 2.1-maint -> master.