Merge branch 'master' into stock-status-fix-again

Conflicts:
	corehq/apps/reports/commtrack/data_sources.py