Merge in from feature/fusefs-backport/master
Fix some whitespace on the diff so it will apply cleaner in the future, if fuse is changed on master.