Merge pull request #11968 from allnes:detect_qr_code
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 15:38:46 +0000 (15:38 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 15:38:46 +0000 (15:38 +0000)

Trivial merge