2.0.0 live

1.6.x moved to branch 1.6.x