Merge pull request #11959 from pengli:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 11:20:02 +0000 (11:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 11:20:02 +0000 (11:20 +0000)

Trivial merge