Optimise String usage using String.intern
Merge pull request #1281 from emmanuel-keller/1.6

Optimise String usage using String.intern