Changes between #173 and #299

No builds.