Update Master for 3.1.2