Bumped version/changelog
Merge branch 'release-3.1.6' into develop