Merge pull request #12351 from NobuoTsukamoto:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 30 Aug 2018 18:10:01 +0000 (21:10 +0300)
committerGitHub <noreply@github.com>
Thu, 30 Aug 2018 18:10:01 +0000 (21:10 +0300)

Trivial merge