Merge branch '3.2-maint'

* 3.2-maint:
  Handle some more "stale NFS file handle" cases
  Handle "Stale NFS File Handle" cases better.

diff --cc NEWS.txt
Simple merge

diff --cc ccache.c
Simple merge

diff --cc util.c
Simple merge