Merge "Replace splitlines() with something more tolerant." am: 064e70f7ca
am: 9769056312

* commit '976905631294195d79c5049ca36607058f691b51':
  Replace splitlines() with something more tolerant.