update the changelog/readme for 2.6
Merge remote-tracking branch 'origin'

Conflicts:
	README