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)
commitb39cd06249213220e802bb64260727711d9fc98c
treef8a82d0d59ea4f7014f06ebe3d454482bd690f48
parent46def2fdc194ebd43a703845013bc54c59ce9d75
parentab8022f74e65f6d4a33c8e64993adc87b0bfaa31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4