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