Master2u b2

I don't know how that happened.
This time the history looks right.

@dwightguth please review.
The main conflicts where around here. I had to make sure the order of the filters follow the new rules.
I suspect it wasn't a clean merge because of line endings.