Use exmpp/master (from jeanparpaillon)