Merge branch 'mc-fastsnapshot' into mc

Conflicts:
	src/mc/mc_visited.c

diff --cc src/mc/mc_global.c
index fe8508b,1359cf3..524056e
--- 1/src/mc/mc_global.c
--- 2/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@@ -278,10 -302,11 +304,14 @@@ void MC_init(
      MC_ignore_global_variable("maestro_stack_start");
      MC_ignore_global_variable("maestro_stack_end");
      MC_ignore_global_variable("smx_total_comms");
 +    MC_ignore_global_variable("communications_pattern");
 +    MC_ignore_global_variable("initial_communications_pattern");
 +    MC_ignore_global_variable("incomplete_communications_pattern");
  
+     if (MC_is_active()) {
+       MC_ignore_global_variable("mc_diff_info");
+     }
+ 
      MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double));
  
      smx_process_t process;

diff --cc src/mc/mc_private.h
Simple merge

diff --cc src/mc/mc_visited.c
Simple merge