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

* commit '064e70f7caa3c948c47e85dfb945530394242c58':
  Replace splitlines() with something more tolerant.