Changes between #358 and #388

No builds.