Built shop-ware from commit f321e70 on branch master