Updated to the latest 3.1.0-RC2-dev