Whitespace
Backport panic_action

Seeing as were probably going to end up supporting v2.x.x for a while longer...