Merge pull request #95 from joefitzgerald/develop

1.21 Release - Develop Merge into Master
Update CHANGELOG.md
Merge branch 'master' into develop