Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 11 Jun 2019 20:42:50 +0000 (20:42 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 11 Jun 2019 20:43:40 +0000 (20:43 +0000)

Trivial merge