Merge lastest revisions from lbl-srg:ffd

This merges the latest version from the `Buildings` library.
I merged lbl-srg:master to lbl-srg:ffd, resolved any conflicts, and then issued this pull request.