Built shop-ware from commit def86a5 on branch master