need a newer happy than is in stable
Merge branch 'master' into stable-ghc-snapshot