Merge pull request #2095 from tomchristie/3.0-beta

3.0 beta