Merge remote branch 'origin/3.1.x' into 3.1.x