Merge pull request #2612 from xmcclure/largestring