Merge branch 'master' of github.com:metabase/metabase into saved-questions

.dir-locals.el

src/metabase/driver.clj

src/metabase/driver/query_processor.clj

src/metabase/driver/query_processor/annotate.clj

src/metabase/models/metric.clj

src/metabase/models/segment.clj

src/metabase/util.clj

test/metabase/driver/query_processor/expand_resolve_test.clj

test/metabase/driver/query_processor/qp_middleware_test.clj

test/metabase/util_test.clj