fav links
auto-merge

* master-cname-ja:
  fav links