am 4381040f: Merge "Change getline to not count the null terminator"

* commit '4381040f43c2d1887aea1c1ca8da8e75935db815':
  Change getline to not count the null terminator