Merge branch 'master' into pulses

...tend/src/admin/databases/components/DatabaseEditForms.jsx

frontend/src/admin/databases/databases.controllers.js

frontend/src/setup/components/DatabaseStep.jsx

frontend/src/setup/reducers.js

src/metabase/api/database.clj

src/metabase/api/routes.clj

src/metabase/core.clj

src/metabase/db.clj

src/metabase/models/setting.clj

test/metabase/api/database_test.clj