Improved file test, allowed abortion
Merge branch 'master' into mount_tests