Update to waf 1.7.9
Merge with master