Fixes #2542 and #2946.
Fixes #2542 and #2946.


jimbonator/shotwell,Sanva/shotwell-gsoc,ritchiewilson/shotwell,jimbonator/shotwell,Sanva/shotwell-gsoc,h4ck3rm1k3/shotwell,ritchiewilson/shotwell,h4ck3rm1k3/shotwell,polymeris/shotwell,damianmoore/shotwell,jof/shotwell,abrauchli/shotwell,damianmoore/shotwell,abrauchli/shotwell,polymeris/shotwell,h4ck3rm1k3/shotwell,abrauchli/shotwell,ritchiewilson/shotwell,jimbonator/shotwell,polymeris/shotwell,Sanva/shotwell-gsoc,damianmoore/shotwell,jof/shotwell,jof/shotwell