Bump version to 3.1.1
Merge remote branch 'upstream/master'