Changes between #165 and #167

No changes in any of the builds.