Sync with Gotham final

As this is a pure sync, I will merge myself in a few hours except if somebody expresses an objection...