Merge branch 'master' into development/6.0.0

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

Description

Merge branch 'master' into development/6.0.0

Merged Changes

CommitAuthorDetailsCommitted
999b629ce0d1mqualmann
after using the metadata editor, we need a full re-scan BUGS: 391440 FIXED-in… 
Mar 5 2018