Only actual strings should be split...
Merge commit 'ba9657ddaf9468f504e1739c75372946a00618d2'