Updated to 1.12-dev2