(cherry picked from commit 85a44115d007e4081eb8ef4f5502a2f0277ad1dd)

Conflicts:
	src/common/exif.cc
Merge branch 'master' of https://github.com/darktable-org/darktable