Merge branch 'hotfix/1.1.1'
Merge branch 'develop' of https://github.com/legidio/bennu into develop