Merge branch 'master' into v6.0

No match.