Merge branch 'master' of https://github.com/Itseez/opencv
authorAlexandr Kondratev <theg4sh@gmail.com>
Tue, 5 Jul 2016 10:34:11 +0000 (13:34 +0300)
committerAlexandr Kondratev <theg4sh@gmail.com>
Tue, 5 Jul 2016 10:34:11 +0000 (13:34 +0300)

Trivial merge