Merge branch 'Plasma/5.11'

Authored by davidedmundson on Sep 20 2017, 4:50 PM.