Merge branch 'hpfs' from Mikulas Patocka