am 097fc64d: Merge "Don\'t signal an error at the end of a short file" into lmp-mr1-dev

* commit '097fc64d8d888be76bb8c7386e9dde0b101a7fa5':
  Don't signal an error at the end of a short file