[maven-release-plugin] prepare release 2.5.0.Final
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch 'upstream/master'