OpenCV 3.4.2 upstream/3.4.2
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 4 Jul 2018 11:05:47 +0000 (14:05 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 4 Jul 2018 11:05:47 +0000 (14:05 +0300)

Trivial merge