Merge branch 'mc-reports-dev' into staging2

unclear to me why this had merge conflicts; seems to have a history of that on staging2

Conflicts:
	custom/reports/mc/reports/sql.py