Merge branch 'master' into editing

Conflicts:
	src/scripts/modules/media/footer/attribution/attribution-template.html