Redirect unregistered subdomains to the primary site
Merge branch 'master' into production

* master:
  Redirect unregistered subdomains to the primary site