Merge master onto 1.0.x release branch
This PR merges the current master
branch onto the 1.0.x
release branch, in anticipation of a 1.0.1 release. This should be kosher, since only bug-fix changes have been merged since the 1.0.x branch was created.