Merge master into 127

My git-fu is not strong enough to show just what had to change during the merge itself, but here's a git diff between what a "git merge" produces and this PR:
https://gist.github.com/aarondav/adb7a9a57be88171b06a