Built shop-ware from commit 3547f16 on branch master