Changes between #250 and #276

No builds.