[3.0] Send 3.0 To The Master

### DO NOT MERGE THIS YET

**This pull request let's us easily review the changes between 2.2 and 3.0.**

---
Once we're happy with 3.0, I'll create a 2.2 branch, and 3.0 will be merged to the master.