Built shop-ware from commit b486c06 on branch master