Bump version to 3.1m2 / 1.1m2
Merge branch 'master' into CFY-1011-fix-unicode-strings-in-output