Merge from tags/2.5.0rc1 to trunk
4 files changed