Oops.
OK. This should work.
Merge branch '3.0' into D6.3.0