Preparing release 2.1
Back to development: 2.2
Merge branch 'star' into hotfix/8727-question-mail-changes

Conflicts:
	docs/HISTORY.txt
	setup.py
We don't want HTML emails. refs #8727
prep P3.12 hotfix release
Preparing release P3.12.0
Back to development: P3.12.1
Merge branch 'hotfix/8727-question-mail-changes' into develop