Packages from the vendor cwles

cwles/build-query