Upped version to 2.0.0pre1.
Merge branch 'master' into support/2.0