Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream