I think I got all the changes that sync up with the master branch.