Merge proposals dependent on lp:~tom-gall/germinate/fix-717879

lp:~tom-gall/germinate/fix-717879 has no merge proposals.