Merge branch 'fix_postgresql_conf_quote_logic'
Merge branch 'allow_specification_of_default_db_name'