Merge proposals dependent on lp:~bakkerl/xibo/1.6

lp:~bakkerl/xibo/1.6 has no merge proposals.