Merge pull request #2066 from hcwhan/master
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 15 Aug 2018 15:41:15 +0000 (18:41 +0300)
committerGitHub <noreply@github.com>
Wed, 15 Aug 2018 15:41:15 +0000 (18:41 +0300)
the 'infinite' error in zh-cn


Trivial merge