Merge pull request #1050 from YosysHQ/clifford/wandwor