Merge branch 'master' into 2635-failing-test [ci skip]

.../admin/datamodel/components/revisions/RevisionHistory.jsx

...etabase/admin/datamodel/components/revisions/TextDiff.jsx

...end/src/metabase/admin/datamodel/containers/MetricApp.jsx

...nd/src/metabase/admin/datamodel/containers/MetricForm.jsx

...etabase/admin/datamodel/containers/RevisionHistoryApp.jsx

...nd/src/metabase/admin/datamodel/containers/SegmentApp.jsx

...d/src/metabase/admin/datamodel/containers/SegmentForm.jsx

...end/src/metabase/admin/datamodel/datamodel.controllers.js

frontend/src/metabase/admin/datamodel/datamodel.module.js

frontend/src/metabase/admin/datamodel/reducers.js

frontend/src/metabase/admin/datamodel/selectors.js

frontend/src/metabase/admin/people/actions.js

...tend/src/metabase/admin/people/components/AdminPeople.jsx

...end/src/metabase/admin/people/components/EditUserForm.jsx

...rc/metabase/admin/people/components/UserActionsSelect.jsx

...d/src/metabase/admin/people/components/UserRoleSelect.jsx

...d/src/metabase/admin/people/containers/AdminPeopleApp.jsx

frontend/src/metabase/admin/people/people.controllers.js

frontend/src/metabase/admin/people/people.module.js

frontend/src/metabase/admin/people/reducers.js