Merge master into the branch to resolve conflicts.

Merging master back into the branch. If this isn't the usual way you guys fix merge conflicts, let me know.