am 09251319: Merge "Suppress horizontal scrolling with trailing blanks"

* commit '0925131933e25a4e0004b3eefc05be65348dc947':
  Suppress horizontal scrolling with trailing blanks