Merge pull request #8543 from csukuangfj:fix-String
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Jun 2017 11:20:28 +0000 (11:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Jun 2017 11:20:29 +0000 (11:20 +0000)

Trivial merge