Merged changes from multi-ghc-travis