2.0.0a-1

First serious commit for the 2.x branch