-sync from msgit

Signed-off-by: ymsquall <ymsquare@hotmail.com>