Merge branch 'Plasma/5.9'

Authored by broulik on Feb 20 2017, 1:17 PM.