move to v2_0 (bug 937701)
Merge pull request #178 from andymckay/937701

move to v2_0 (bug 937701)