Merge branch 'versions/0.4'
Merge tag 'v0.4.1'
Merge branch 'versions/0.4'
Merge tag 'v0.4.2'
Merge remote-tracking branch 'upstream/master' into dev

隔合原作者修改