merge 3.5

This commit is contained in:
Benjamin Peterson 2015-09-27 02:14:29 -07:00
commit eca7172c3c