Finish 2.5.0-rc.2
Fix typo in package.json
Merge branch 'develop'