Output filter: Support Waf and scons, too
Thanks to John for the initial patch
BUG: 331124 FIXED-IN: 1.6.1