Merge branch 'Plasma/5.13'

Authored by jgrulich on Jul 4 2018, 8:00 AM.