Release v1.31

- Merge branch 'OutOfMemoryError'
- Removed rollback at termination