merge 3.4

This commit is contained in:
Benjamin Peterson 2015-11-03 22:43:41 -08:00
commit b25d09a15e