Persevere in the face of failure
Merge remote-tracking branch 'upstream/master' into pump.jpope.org