Merge cruft.
Stopgap for saveas break -- this case about to be removed entirely.
Merge branch 'master' into one-thing-at-a-time