Merge pull request #1384 from YosysHQ/clifford/fix1381