Move over all changes from my private branch.