Merge pull request #11865 from csukuangfj:patch_1
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 2 Jul 2018 10:08:33 +0000 (10:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 2 Jul 2018 10:08:34 +0000 (10:08 +0000)

Trivial merge