Pup 0.8.5: Prevent autostart from running in the air
Authored by: sanhozay 2016-03-23
Parent: [r1624]
Child: [r1626]
