2.5.x

merging from upstream