Upstream/master

Shrug.. this pull request stuff is madness.