more release notes!
Merge branch 'develop' into staging