Merge tag 'v1.10.1'

v1.10.1

I'm doing this merge to make sure that v1.10.1 is in our main history. Things
got screwed up b/c I did a release of v1.10.1 from the Github interface and
screwed up where I was pointing at, somehow. Hopefully this isn't too much of a
problem. -pjg

Author: gadomski