am 51d74bb3: am 43799d70: am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"

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