Merge branch 'winsymdef' (closes #126, closes waf-project/waf#2053)