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

* commit 'f9ff4fb5da5971bd02eec491a497006540e1438a':
  Revert "Only add spaces automatically when appropriate."