Merge remote-tracking branch 'origin' into mvreg
Fix a bug in update_assign_diverge_test
Merge branch 'mvreg' of github.com:SyncFree/floppystore into mvreg