Changes between #358 and #359

No changes in any of the builds.