Merge change Idad5a0ab into eclair

* changes:
  SDK: Remove STOPSHIP keyword.