Merge proposals dependent on lp:~rockstar/entertainer/0.4-bugfixes

lp:~rockstar/entertainer/0.4-bugfixes has no merge proposals.