Fixed the version numbers in the changelog
Merge branch 'stable'