Compatibility change
Merge branch 'develop' of https://github.com/NREL/OpenStudio into develop