Prerelease version of 3.0 with 2.2.2 changes

This is a pre-release build of 3.0.0. It has the features of 3.0 integrated with the bug fix that lead to the 2.2.2 release.