Merge proposals dependent on lp://qastaging/~tomasgroth/openlp/fixes-201906-a

lp://qastaging/~tomasgroth/openlp/fixes-201906-a has no merge proposals.