git-2.0.0
Merge branch 'b2.0.x' into b1.9.x