Built shop-ware from commit 31f4b8f on branch master