Update Makefile dependencies: Closes #7028
Merge branch 'master' of git://yorba.org/shotwell