Merge branch 'Plasma/5.8' into Plasma/5.10

Authored by mart on Jul 17 2017, 4:35 PM.

Description

Merge branch 'Plasma/5.8' into Plasma/5.10

Merged Changes

CommitAuthorDetailsCommitted
30ebb82b11b2mart
don't define behaviors for the same properies in 2 places 
Jul 17 2017