Fix for container clones
Merge remote-tracking branch 'upstream/master'
Merge branch 'upstream-production'
Merge pull request #148 from wshafer/master

Hotfix for domain issue