Merge branch 'master' into development/6.0.0

Authored by mqualmann on Mar 7 2018, 5:39 PM.

Description

Merge branch 'master' into development/6.0.0

Merged Changes

CommitAuthorDetailsCommitted
ba7e22d71fbemqualmann
fix wrong colors in the tooltip under Windows CCBUGS: 391521 
Mar 7 2018
99f2cb6dd21acgilles
update 
Mar 7 2018