Built shop-ware from commit b303134 on branch master