Merge pull request #707 from b4n/waf/c99