Merge branch 'hotfix/mocha3'
Merge branch 'release/v0.11.6'
fix
Merge branch 'hotfix/fix-generator' into develop