#! fix
#! changelog, versions
#! critical bugfixes, doc updated
Merge branch 'master' into jasmine-test