Merge branch 'master' into stable-6.4