am 8c37f49f: Merge "Follow symlinks when using find"

* commit '8c37f49fd02d00b6371fb808d9a9dc836f565e02':
  Follow symlinks when using find