Work on 3.12.1-pre.
Merge branch 'dev-master' into dev-3.x
Work on 3.13.0-pre.