Merge proposals dependent on lp:~dangarner/xibo/server-132

lp:~dangarner/xibo/server-132 has no merge proposals.