Merge branch 'master' into dont_return_db_password_in_api

frontend/src/activity/activity.services.js

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

frontend/src/admin/metadata/components/MetadataEditor.jsx

frontend/src/admin/metadata/metadata.controllers.js

frontend/src/app.js

frontend/src/card/card.services.js

frontend/src/dashboard/dashboard.module.js

frontend/src/dashboard/dashboard.services.js

frontend/src/metabase/metabase.services.js

frontend/src/services.js

frontend/src/setup/setup.controllers.js

frontend/src/setup/setup.services.js

frontend/test/unit/services.spec.js

src/metabase/driver/sqlserver.clj

src/metabase/models/field_values.clj

test/metabase/api/table_test.clj

test/metabase/models/field_test.clj