Built shop-ware from commit 30c6740 on branch master