#! changelog
Merge branch 'master' into jasmine-test