Changes between #154 and #159

No changes in any of the builds.