#! bugfix, changelog, version
Merge branch 'master' into jasmine-test