Commits e70c08cd from mitch and mine
(5335f313) clashed as we did the same
fix nearly the same time on both branches. Let's at least sync so that
the code is exactly the same (just to avoid potential merge conflicts in
the future).