Replaces a deprecated widget in CustomComponents; ref #6893.
Merge branch 'master' of git://yorba.org/shotwell