Prepare release 3.2.31
Merge pull request #522 from rneatherway/master

Prepare release 3.2.31
Merge pull request #519 from 7sharp9/master

Fix for #518