merge changelist.txt into CHANGELOG
Update version in boot.php
Merge remote-tracking branch 'upstream/master'