Merge commit '4afe1f31aa0a2813e92af5c1cf0624dc4f1c47ed' into pathfix

Conflicts:
scripts/zpool-autoimport.sh.in