Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it.
The emulation for the exif function is now much more sleaker
Merge pull request #792 from annando/master

Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it.