Merge pull request #818 from YosysHQ/clifford/dffsrfix