Cleanup
Should have published these ages ago
Merge branch 'master' into alternate_formats