changelog updates
Merge remote-tracking branch 'upstream/develop' into testflight2