Merge branch 'Plasma/5.12' into Plasma/5.14

Authored by ngraham on Nov 29 2018, 4:19 PM.