Changes between #376 and #380

No builds.