Merge pull request #8044 from alalek:opencv_world_with_contrib
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 12:54:15 +0000 (12:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 12:54:16 +0000 (12:54 +0000)

Trivial merge