2.25
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/chp4.rst
2.25