Sacrifice dead chickens for Travis' boneheadedness.
Merge branch 'master' into 8-use_transition_guards