Updated the change-log.
Merge remote -> local.