Update Master to 1.2