2 0 stable differences

Jet, understand if you do not want to commit this as it has gotten quite big at this point...

These are all differences against the 2-0-stable branch you are maintaining.