more to come
Merge branch 'master-cname-ja' into slave-cname-en

* master-cname-ja:
  more to come