Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 10 May 2018 15:19:56 +0000 (18:19 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 10 May 2018 15:19:56 +0000 (18:19 +0300)

Trivial merge