make things work for ghc-7.4
Merge branch 'ghc-7.6-fix'