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

* commit 'f732f4ddccb679369b2fd2e43582b3b15aecfa1d':
  Only add spaces automatically when appropriate.