Manually pull in good stuff from the  branch.