Merge pull request #66 from apache/2.0.x

Merge 2.0.x into master