Changes between #245 and #246

No changes in any of the builds.