prior and related changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	description.tex