Built shop-ware from commit 4d1c97b on branch master