Update upgrade notes
Merge branch 'develop'