Built shop-ware from commit 1113225 on branch master