Merge proposals dependent on lp://qastaging/~mardy/shotwell/fix-pot

lp://qastaging/~mardy/shotwell/fix-pot has no merge proposals.