Mostly complete, some "Operation not permitted errors" show up through FUSE though

Also merged the current changes in master into 2.5dev