Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Sun, 17 Jun 2018 13:26:48 +0000 (16:26 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Sun, 17 Jun 2018 13:26:48 +0000 (16:26 +0300)

Trivial merge