Merge branch 'Plasma/5.8'

Authored by davidedmundson on Dec 15 2016, 1:43 PM.