Update wd to latest version
Merge branch 'master' into geezer