Merge branch 'Plasma/5.12' into Plasma/5.14

Authored by hein on Nov 19 2018, 10:29 AM.

Description

Merge branch 'Plasma/5.12' into Plasma/5.14

Details

Merged Changes

CommitAuthorDetailsCommitted
454347370883hein
Revert unintended line 
Nov 19 2018