Merge branch 'waf' into python