Merge pull request #1887 from rubenk/make-xfs-optional