Built shop-ware from commit 0154916 on branch master