[3.2] Add commits cc'd to stable, up to 4.15

...and their obvious dependencies.
119 files changed