Merge pull request #1686 from rubenk/zfs-arc