Update branch to 3.1.2