Merge branch 'issue2-untrack-local-file'
Merge remote-tracking branch 'upstream/next-2.27'
Merge remote-tracking branch 'upstream/next-2.27'
Merge branch 'master' of github.com:sunyc/fluffos into i7-make-test