Merge pull request #1026 from YosysHQ/clifford/fix1023