Merge pull request #3269 from alexanderkyte/silence_zero_len