Merge branch 'jc/lstat'