am bb815129: am b386a86c: Merge change I8018f091 into eclair

Merge commit 'bb8151294c020f52cda84d006ba55d9baa069229'

* commit 'bb8151294c020f52cda84d006ba55d9baa069229':
  Add very simple input path. Fix end-of-line issues.