Merge pull request #104 from apache/release/2.5.0

Release/2.5.0