Merge pull request #2 from apache/trunk

[apache merge] Merge from apache/hadoop, 20141108.