Re-enable NFS (added --enable-nfs in configure script)
Merge branch 'auto_nfs'