Merge change Ib7c1701a into eclair

* changes:
  Fix issue #1930911: Crash in system process