merge 2.6.0 to trunk
2 files changed