fixed a typo
merged branch 2.0.x into 2.1.x
merged branch 2.1.x into 3.0.x