Merge pull request #6088 from mshabunin:fix-exif-parsing
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 8 Feb 2016 16:01:07 +0000 (16:01 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 8 Feb 2016 16:01:07 +0000 (16:01 +0000)

Trivial merge