Extend unhappy workaround for bytestring-lexing
Merge branch 'master' into circuithub-deploy