Minor refactor, re #169
Changelog re #169
Fix docstrings re: addition of `getfo`/`putfo`, closes #229
Merge branch '1.13' into 1.14
Merge branch '1.14'