Merge remote branch 'origin/master' into ghc-generics

compiler/coreSyn/CoreUnfold.lhs

compiler/coreSyn/CoreUtils.lhs

compiler/ghc.cabal.in

compiler/ghc.mk

compiler/ghci/ByteCodeFFI.lhs

compiler/ghci/ByteCodeInstr.lhs

compiler/main/DynFlags.hs

compiler/main/Packages.lhs

compiler/main/StaticFlags.hs

compiler/main/SysTools.lhs

compiler/prelude/ForeignCall.lhs

compiler/prelude/PrimOp.lhs

compiler/prelude/primops.txt.pp

docs/users_guide/flags.xml

docs/users_guide/glasgow_exts.xml

docs/users_guide/using.xml

includes/Rts.h

includes/rts/EventLogFormat.h

includes/rts/Flags.h

includes/rts/storage/GC.h