Update change log.
Merge branch '4.1'