Fixing Linux build errors.
Merge branch 'origin/develop'