Merge change Id93f4c9e into eclair

* changes:
  Turn off the last of the STOPSHIP verbose debugging