Merge back master branch.

Conflicts:
	src/smpi/smpi_bench.c

diff --cc src/smpi/smpi_bench.c
index 2a38ef7,e531e85..b9d6366
--- 1/src/smpi/smpi_bench.c
--- 2/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@@ -14,7 -15,7 +15,8 @@@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_be
  
  xbt_dict_t allocs = NULL;       /* Allocated on first use */
  xbt_dict_t samples = NULL;      /* Allocated on first use */
+ xbt_dict_t calls = NULL;        /* Allocated on first use */
 +__thread int smpi_current_rank = 0;      /* Updated after each MPI call */
  
  typedef struct {
    int count;