Merge branch 'master' into zeroFlow
Merge branch 'zeroFlow' of https://github.com/lbl-srg/modelica-buildings into zeroFlow