Merge remote-tracking branch 'origin/3.1.2-post' into 3.1.x