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