Support for cabal-install 1.20.0.3
Merge branch 'ghc-7.8.3' into circuithub-ghc-7.8.3