Built shop-ware from commit b8c1533 on branch master