V2.1.3 hotfix -- commit #1

These have to be done via the web interface since there's uncommitted code in the restructure branch.