Merge branch 'hpfs' (patches from Mikulas)