am dd586f3e: am 613584a2: am 81fa3039: Merge "Remove yet more fixed-length buffers (and their overruns)."

* commit 'dd586f3e27e0bc5a75adc104c9144bc686bc08ca':
  Remove yet more fixed-length buffers (and their overruns).