Merge branch 'wip/new-flatten-skolems-Aug14' of https://git.haskell.org/ghc into...