At the meeting today we discussed merging. Please remember to merge fixes in Plasma/5.8 into Plasma/5.9 branches and into master.
I've now scheduled in doing this the day before 5.9.x releases but obviously it's much less error prone if you do it when you first commit. Jonathan
