Merge branch 'master' of https://github.com/wiryls/opencv
authorMYLS <Wiryls@gmx.com>
Fri, 15 Jul 2016 10:46:07 +0000 (18:46 +0800)
committerMYLS <Wiryls@gmx.com>
Fri, 15 Jul 2016 10:46:07 +0000 (18:46 +0800)

Trivial merge