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

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