Give 'find' a path so it behaves on FreeBSD
Merge remote-tracking branch 'upstream/master'