Changes between #250 and #299

No builds.