support template-haskell 2.10
Merge branch 'master' into ghc-7.10
updates for template-haskell