Merge change If990cab0 into eclair

* changes:
  Make sure to acknowledge stale broadcasts