Update changelog
Merge remote-tracking branch 'fork-source/master'
merged from fork-source