Fixing compile error on Mac
Merge branch 'develop' of github.com:NREL/OpenStudio into develop