am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev

* commit 'e4958d5c185ecf3a4e953c4a20f0208ac396da56':
  Correctly add double quote to the space strippers