Merge pull request #11989 from csukuangfj:patch_2
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 10:27:21 +0000 (10:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 10:27:21 +0000 (10:27 +0000)

Trivial merge