Update change log.
Update change log.
Merge branch '4.2'