Merge branch '5.4' into 5.5

Authored by mwolff on Jan 22 2020, 9:24 AM.

Description

Merge branch '5.4' into 5.5

Details

Merged Changes

CommitAuthorDetailsCommitted
23c7fec54cc2mwolff
Fix build against clang built from git 
Jan 22 2020