Merge branch 'hotfix/mocha2'
fix
Merge branch 'hotfix/coveralls2' into develop