Merge pull request #11921 from allnes:detect_qr_code
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 13 Jul 2018 14:26:17 +0000 (14:26 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 13 Jul 2018 14:26:17 +0000 (14:26 +0000)

Trivial merge