Updated waf toolchain.
Merge branches from different machines.