Changes between #334 and #335

No changes in any of the builds.