Merge pull request #405 from the-hideout/branch-deploy-v11

Merge pull request #405 from the-hideout/branch-deploy-v11 #734