Merge pull request #1 from apache/newbranch

Merge some stuff