bring ChangeLog entries from master commit
2 files changed