Merge remote-tracking branch 'origin/2.0'

Authored by kfunk on Mar 22 2018, 6:45 AM.

Description

Merge remote-tracking branch 'origin/2.0'

Merged Changes

CommitAuthorDetailsCommitted
49c6e9102a72kfunk
CMake: Fix a few CMake autogen warnings 
Mar 22 2018