Built shop-ware from commit eed7a55 on branch master