Cherry-pick of "Merge branch 'StandaloneFixes-1.0-20170628' into '1.0'" into master
Standalone Build Fix(es), 1.0 branch (2017.06.28.)
See merge request !91 (merged)
Standalone Build Fix(es), 1.0 branch (2017.06.28.)
See merge request !91 (merged)