Back-merge
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 20 Sep 2014 05:31:52 +0000 (22:31 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 20 Sep 2014 05:31:52 +0000 (22:31 -0700)

Trivial merge