Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 5 Sep 2018 16:52:16 +0000 (19:52 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 5 Sep 2018 16:54:09 +0000 (19:54 +0300)

Trivial merge