Merge branch 'Plasma/5.12'

Authored by davidedmundson on Mar 26 2018, 1:06 PM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
dad98acf635dD11559davidedmundson
Fix default colour used by Swap monitor 
Mar 26 2018