Update CHANGELOG for merge of #285