Merge branch 'fix-ghc-gmp-misconfiguration' into develop

* fix-ghc-gmp-misconfiguration:
  fix ghc 7.6.1