Refactor
Refactor
Merge remote-tracking branch 'origin/refactor'
Catch up GHC-7.8.3+HP-2014.2.0.0