Bump version to 1.3.1
Merge remote-tracking branch 'origin/master' into devel