Merge branch 'Plasma/5.12'

Authored by dvratil on Jan 23 2018, 11:14 AM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
295fdfcb7dc1dvratil
Fix tests after recent changes 
Jan 23 2018