Merge branch 'waf' into gh-pages