There are some bits left to do but this folds in all the main stuff from
2.4 and 2.5 including Al's recent change