Update version no. and changelog for final release
Merge branch 'release-2.1.3' into dev