Merge 2.10.1 into master

The [nomaster] commits have been merged with git merge -s ours.