Changes to reflect changes in GHC's type HsTyVarBndr
Merge branch 'master' into roles