Added --no-db option to prevent exiting if neither an instance nor a dbname is specified.  Useful for "show databases".
Merge branch 'dev' into test