Merge branch 'stable-5.0'