Changes between #311 and #338

No changes in any of the builds.