am 79d3eb5f: am 4df3c35c: Merge change Ie3890f91 into eclair

Merge commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536'

* commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536':
  Fixes