#! fix in doc
Merge branch 'master' into jasmine-test