Built shop-ware from commit d7bc702 on branch master