Merge branch 'master' into Adar

Conflicts:
	app/assets/stylesheets/reports/query.css.scss