Update avatar change tool, fix bug 3619, 2209, 6315.
Merge remote-tracking branch 'origin/master'