Merge proposals dependent on lp:~markellmtthw/beat-box/fix-928000

lp:~markellmtthw/beat-box/fix-928000 has no merge proposals.