Update change log.
Merge branch '4.0'