Remove remaining 5.2 reference
Merge branch 'master' into my-3.0