[Bug 550951] [maintenance] Cherrypick fixes from f-spot 0.6.1.4