2.1 changelog additions
Merge pull request #163 from bbodenmiller/develop

2.1 changelog additions