Merge branch 3.0

@pjackson @nschonni can someone review this, there was a lot of merge conflicts and I want to be sure I didn't override anything.