Merge change Ie6d16a89 into eclair

* changes:
  Fix an issue related to ping loop errors and ping state; add logging