Merge pull request #11927 from pengli:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 11 Jul 2018 09:33:24 +0000 (09:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 11 Jul 2018 09:33:24 +0000 (09:33 +0000)

Trivial merge