Merge pull request #11971 from csukuangfj:patch_1
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 15 Jul 2018 15:06:16 +0000 (15:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 15 Jul 2018 15:06:17 +0000 (15:06 +0000)

Trivial merge