am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev

* commit '191d49ae8a0f4bb10724b83d9424d80f08ac7181':
  Only add spaces automatically when appropriate.