Merge pull request #9737 from huningxin:fix_9729
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 28 Sep 2017 08:57:19 +0000 (08:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 28 Sep 2017 08:57:19 +0000 (08:57 +0000)

Trivial merge