Built shop-ware from commit d6b7784 on branch master