More safety checks
Merge branch 'master' into flask
Be more honest