Updating to waf-tools version 2.x.y