Prepare for 2.0 release.
Merge pull request #1589 from sylus/7.x-2.x

Updates for 2.x branch.