Prepare for 3.1.0 release
Prepare for 3.1.1 development
Merge remote-tracking branch 'remotes/upstream/master' into cleanup