Changes between #357 and #358

No changes in any of the builds.