Merge change I2492bffe into eclair

* changes:
  Remove STOPSHIP comment.