Merge change I6d3d5b7e into eclair-mr2

* changes:
  File upload.