Merge branch 'master' of github.com:metabase/metabase into port-to-entity-containers

frontend/src/metabase/visualizations/visualizations/Map.jsx

src/metabase/api/common.clj

src/metabase/api/metric.clj

src/metabase/api/permissions.clj

src/metabase/api/segment.clj

src/metabase/api/tiles.clj

src/metabase/api/user.clj

src/metabase/models/collection.clj

src/metabase/models/interface.clj

src/metabase/models/metric.clj

src/metabase/models/permissions_group_membership.clj

src/metabase/models/pulse.clj

src/metabase/models/revision.clj

src/metabase/models/segment.clj

src/metabase/models/user.clj

src/metabase/util.clj

test/metabase/api/metric_test.clj

test/metabase/api/permissions_test.clj

test/metabase/api/pulse_test.clj

test/metabase/api/segment_test.clj