Merge pull request #393 from markcowl/release-0.6.13

Fix for Issue #392
Possible fix for site start/stop/restart wiping out custom hostnames
Merge pull request #398 from christav/site-restart-fix

Possible fix for site start/stop/restart wiping out custom hostnames
Mitigation for Issue#399