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

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