Merge proposals dependent on lp:~jose/summit/plain-else-attend-fix

lp:~jose/summit/plain-else-attend-fix has no merge proposals.