Changes between #253 and #256

No builds.