Merge pull request #8371 from csukuangfj:patch-8
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 14 Mar 2017 13:23:02 +0000 (13:23 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 14 Mar 2017 13:23:02 +0000 (13:23 +0000)

Trivial merge