Merge remote-tracking branch 'origin/thrift-version'
authorKeith Turner <kturner@apache.org>
Tue, 6 Sep 2016 19:10:49 +0000 (15:10 -0400)
committerKeith Turner <kturner@apache.org>
Tue, 6 Sep 2016 19:10:49 +0000 (15:10 -0400)

Trivial merge