Changes between #154 and #157

No changes in any of the builds.