Added fix for duplicate album on new album (and new image)
Merge branch 'master' into dup_fix