Commit b7822050c99b8ea198d96e98cb720aa24a8230d0

Patrick Steinhardt 2016-11-11T11:25:39

Merge pull request #3993 from alexcrichton/fix-fault