Merge branch 'master' of github.com:simgrid/simgrid

diff --combined include/simgrid/s4u/Mailbox.hpp
index 9e41dc1,6dd0394..7895026
--- 1/include/simgrid/s4u/Mailbox.hpp
--- 2/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@@ -102,10 -102,8 +102,10 @@@ namespace s4u 
   * @section s4u_mb_api The API
   */
  class XBT_PUBLIC Mailbox {
 +#ifndef DOXYGEN
    friend Comm;
    friend simgrid::kernel::activity::MailboxImpl;
 +#endif
  
    simgrid::kernel::activity::MailboxImpl* pimpl_;
  
@@@ -133,6 -131,9 +133,9 @@@ public
    /** Check if there is a communication going on in a mailbox. */
    bool listen();
  
+   /** Check if there is a communication ready to be consumed from a mailbox. */
+   bool ready();
+ 
    /** Gets the first element in the queue (without dequeuing it), or nullptr if none is there */
    smx_activity_t front();