Please avoid merging stuff which would conflict with this. [donotmerge]

some recent merges were lost due to entire conflicting files. I did ask nicely.