Built shop-ware from commit 1155e04 on branch master