Merge branch 'hotfix/badges4'
fix coveralls
Merge branch 'master' into develop