am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit '794b587b37e3f32c081e5fdc084581be9d68292d':
  Fix entry handling for 0 length entries.