Release 3.1
Merge branch 'master' into 3.1
Merge branch '3.1'