waf 1.7.13
Merge branch 'waf' into develop
Merge branch 'develop'