Merge pull request #5653 from jia-kai:fix-jpeg-exif
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Fri, 20 Nov 2015 15:37:50 +0000 (15:37 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Fri, 20 Nov 2015 15:37:50 +0000 (15:37 +0000)

Trivial merge