Only run builds against 3.0 for now
Merge branch 'master' into 3.0