merge 3.5

This commit is contained in:
Benjamin Peterson 2017-01-16 00:05:47 -08:00
commit 741c45adab