merge 3.6

This commit is contained in:
Benjamin Peterson 2016-09-19 22:20:19 -07:00
commit b90d15d57e