Disallow flying in the stall
Merge branch 'master' into gh-pages