Update README and ChangeLog
Merge branch 'release-1.2'