Merge pull request #1305 from aparcar/stringify