Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 25 Jun 2018 19:03:17 +0000 (22:03 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 25 Jun 2018 19:03:17 +0000 (22:03 +0300)

Trivial merge