Merge pull request #1170 from YosysHQ/eddie/fix_double_underscore