Merge branch 'Plasma/5.2'

Authored by broulik.

Description

Merge branch 'Plasma/5.2'

Merged Changes

CommitAuthorDetailsCommitted
1bc24e996a62broulik
Fix crash when one of the combo boxes is not present 
Feb 7 2015