Trans

Merge transition branch with master, ready for transition to 2.0