Built shop-ware from commit afdb395 on branch master