Merge 0.14 back into master

It's huge, but all tests pass.
And It seems I haven't forgotten any dependency bumps