Updating the master branch for 2.0 development.