Built shop-ware from commit db6308c on branch master