More elaborate exit stati with -q.
Support -h and --help.
Merge branch 'master' into auto