integrate release 3.1.1 to master
Merge remote-tracking branch 'origin/master' into develop