Updated changelog
Merge pull request #3891 from edx/flowerhack/changelog

Updated changelog