Packages from the vendor jxw

jxw/bjd