This contains just the average.h change in order to get it into the tree before adding new users through -next trees.
