Updating to 3.0-dev branch