Upgrade to 2 0 stable

The origin of this branch is 1-3-stable.
Tests don't pass yet.