Merge branch 'Plasma/5.7'

Authored by davidedmundson on Jun 16 2016, 4:04 PM.