Merged in changes from development repository:

   Added code for the `database-username' and `database-password' options.