Added 3.1.2 changelog
Merge branch 'tmp-3.1.2' into 3.1