Merge branch 'Plasma/5.8'

Authored by apol on Sep 19 2016, 1:24 PM.

Description

Merge branch 'Plasma/5.8'

Merged Changes

CommitAuthorDetailsCommitted
89c34a853b64D2813apol
Readability. Simplify overly complex code 
Sep 19 2016