Merge pull request #218 from pengzhai/master

Fix data race issue in TextFormatter. Fix for https://github.com/Siru