Merge proposals dependent on lp:~gingerchris/endroid/assorted_bug_fixes

lp:~gingerchris/endroid/assorted_bug_fixes has no merge proposals.