Merge branch 'release-0.12.0' into nalanda-rct2

Conflicts:
	kalite/testing/mixins/facility_mixins.py