Merge branch 'master' of belledonne-communications.com:belle-sip Conflicts: include/belle-sip/message.h