Built shop-ware from commit a0c518f on branch master