Reflect changes from #516.
Merge pull request #522 from abuiles/update-changelog

Reflect changes from #516.