It's hard to code review a merge between two branches that changes as many files as this one does. It *looks* ok.