Fix another midnight test failure
Merge branch 'master' into subdomains

* master:
  Fix another midnight test failure