Made regression-1789 clean up after itself, and made 1081.yaml not use a table named "t309".
Merge branch 'next' into sam_1903