Removed passwords from being transmitted by /get-db-json. This does not seem to have broken anything.
Merge remote-tracking branch 'remotes/origin/master'