Merge branch 'Plasma/5.8'

Authored by mart on Oct 7 2016, 11:36 AM.

Description

Merge branch 'Plasma/5.8'

Merged Changes

CommitAuthorDetailsCommitted
921722093048D2967mart
delete containments upon activity deletion 
Oct 7 2016