This brings us up to date with the code currently in review in:
https://github.com/zfsonlinux/zfs/pull/8987