Merge pull request #7719 from paroj:calib_ret
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 25 Nov 2016 09:22:07 +0000 (09:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 25 Nov 2016 09:22:08 +0000 (09:22 +0000)

Trivial merge