Merge branch 'master' of https://github.com/es0m/opencv
authorEric Sommerlade <es0m@users.noreply.github.com>
Mon, 31 Oct 2016 11:10:01 +0000 (11:10 +0000)
committerEric Sommerlade <es0m@users.noreply.github.com>
Mon, 31 Oct 2016 11:10:01 +0000 (11:10 +0000)

Trivial merge