Merge change Iea75a523 into eclair

* changes:
  Fixes for socket options on multicast sockets.