Built shop-ware from commit 948458b on branch master