Keep master updated with 5.1 changes.

Merge changes to 5.1 forward into master. This should be done periodically. All the changes have previously been reviewed, but it's possible we don't want some in master.