Merge branch 'release-11.0.6' into develop
Add unicorn to Gemfile
Merge branch 'release-11.0.7'