Merge branch 'upstream' into upstream-jgarzik