Merge pull request #14225 from zuoshaobo:my3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 09:57:26 +0000 (09:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 09:57:26 +0000 (09:57 +0000)

Trivial merge