Update README.md
Update CHANGELOG.md
Merge remote-tracking branch 'origin/master' into master-codehaus

Conflicts:
	README.md