Built shop-ware from commit b65decf on branch master