Merge change I290947bb into eclair

* changes:
  Git sucks