Polish for 3.8.13. Not tagging quite yet, pending testing on #713 and #586.