upgrade to waf 1.8.5