changelog updates
Merge branch 'bugfixes'