Changes between #373 and #380

No builds.