Merge proposals dependent on lp:~raoul-snyman/openlp/fix-display-chords

lp:~raoul-snyman/openlp/fix-display-chords has no merge proposals.