Merge branch 'master' into profiling-ncg

Conflicts:
	compiler/profiling/SCCfinal.lhs
	compiler/stgSyn/CoreToStg.lhs
	rts/RtsFlags.c
	rts/sm/GC.c