Built shop-ware from commit 3226621 on branch master