Merge branch 'master' into uniq-ptr
authorTim King <taking@google.com>
Wed, 9 Nov 2016 21:46:43 +0000 (13:46 -0800)
committerTim King <taking@google.com>
Wed, 9 Nov 2016 21:46:43 +0000 (13:46 -0800)

Trivial merge