Updated to 1.8-dev2