Merge branch 'stable-2.5' into devel-2.5