Update CHANGES.txt.
Pep8.
Merge commit '92375bd338b2bdc4a19610c6f8ab92944ca004fb'

Conflicts:
	CHANGES.txt