Changes between #372 and #539

No builds.