Merge branch 'hotfix/v0.13.4'
code climate
bump
Merge branch 'hotfix/v0.13.5' into develop