Update release history
Merge branch 'develop'