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

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