Merge branch 'from-jgarzik-upstream'