Merge branch 'stable-2.6' into devel-2.6