Delivery deftly dodges dreaded delegate duplication discouragement disaster; ref #6893.
Merge branch 'master' of git://yorba.org/shotwell