am 003d7f8d: am e851c562: Merge change Iea75a523 into eclair

Merge commit '003d7f8da66ec53b5dbece36308197dc7a932e3e'

* commit '003d7f8da66ec53b5dbece36308197dc7a932e3e':
  Fixes for socket options on multicast sockets.