Minor changes for Linux build.
Merge branch 'Release_1.0.0'