make true circle on userpic circle (bugid:110466)
Merge branch 'release-6.0rc1' into develop