Merge proposals dependent on lp:~paul-stanley/endroid/assorted_bug_fixes

lp:~paul-stanley/endroid/assorted_bug_fixes has no merge proposals.