Update changelog through d550f21f064f69e9b6e4e7442e7034cf04cf13ea
Merge pull request #1059 from jordansissel/update-changelog

Update changelog through d550f21f064f69e9b6e4e7442e7034cf04cf13ea