Merge from shotwell-0.15 for 0.15.1