Fix typo in GHC.Utils for the benefit of 7.6 users
Merge branch 'master' into conditionals