Built shop-ware from commit 3c79164 on branch master