Merge pull request #12156 from cv3d:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 14 Aug 2018 14:29:17 +0000 (14:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 14 Aug 2018 14:29:17 +0000 (14:29 +0000)

Trivial merge