Add Thrift comment
Merge branch 'master' into thrift