Merge 3.0-stable back to master

Looks like we're making a lot of changes to `3.0-stable` that haven't made it back to `master` so I did a merge in hopes of keeping them in sync.