Merge branch 'mptcp-C-flag-and-fixes'