Merge change Ibb6bf6b8 into eclair

* changes:
  Minor cosmetic cleanups.