Merge remote-tracking branch 'joar/exif-rebase'