Merge change Ia5ef9acd into eclair

* changes:
  remove an old STOPSHIP comment