Merge pull request #8497 from jbradish/master
Merge branch 'jbradish-master'