Release: version 3.1.0
Merge remote-tracking branch 'upstream/master'