build issues: merge with master
upgrade: ghc 7.8.2