Merge branch 'master' into benchmark

diff --combined .gitignore
index 969e75ba5797c88b6da2cb1141c96d687b395fbe,8a0d08796aeacd90c8a73bdc47ceb2f79f8410b2..bbb67422382bd92f1d9c8bb0fc473f64551519ba
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -41,10 -41,10 +41,10 @@@ test_kernel_data_trac
  test_ust_data_trace
  kernel_all_events_basic
  kernel_event_basic
- ust_global_all_events_basic
+ ust_global_event_wildcard
  ust_global_event_basic
  gen-nevents
  gen-events-time
  gen-events
  
 -benchmark/
 +benchmark/bench_sessions