Merge pull request #3713 from metabase/multiple-aggregations

.dir-locals.el

src/metabase/core.clj

src/metabase/driver/bigquery.clj

src/metabase/driver/druid/query_processor.clj

src/metabase/driver/generic_sql/query_processor.clj

src/metabase/driver/mongo/query_processor.clj

src/metabase/query_processor.clj

src/metabase/query_processor/annotate.clj

src/metabase/query_processor/expand.clj

src/metabase/query_processor/interface.clj

src/metabase/query_processor/macros.clj

src/metabase/util.clj

test/metabase/api/dataset_test.clj

test/metabase/query_processor/expand_resolve_test.clj

test/metabase/query_processor/macros_test.clj

test/metabase/query_processor_test.clj