Built shop-ware from commit bd254f5 on branch master