Versioning
- Added changes to changelog
- Upped version numbers
Merge branch 'release/v3.1.2' into develop