Merge proposals dependent on lp:~mathias-porten/pantheon-photos/fix-1467148

lp:~mathias-porten/pantheon-photos/fix-1467148 has no merge proposals.