Adds CHANGELOG.md [ci skip]
Merge branch 'master' into custom_loop_factory