Merge branch 'stable-6.5'