Changes between #372 and #380

No builds.