Bugfix: Merge fix for Datagram.add_buffer from upstream.