Merge proposals dependent on lp:~sam92/openlp/bug-1117098

lp:~sam92/openlp/bug-1117098 has no merge proposals.