Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 13 Oct 2016 16:19:17 +0000 (16:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 13 Oct 2016 16:19:18 +0000 (16:19 +0000)

Trivial merge