Update CHANGES for 1.3.6.

Conflicts:
	CHANGES