Merge didn't work; pulling from master

So far as I can tell, nothing from the test suite was updated last time
the branch was merged with master. I'm fixing this now.