Merge branch 'Plasma/5.12' into Plasma/5.13

Authored by davidedmundson on Jun 20 2018, 7:28 AM.

Description

Merge branch 'Plasma/5.12' into Plasma/5.13

Merged Changes

CommitAuthorDetailsCommitted
1ab6ae9a8a36davidedmundson
Revert "Fix tooltip woes" 
Jun 20 2018