Additions from docker/zfs (take 2)

see #23