Merge branch 'master' into dump-fixes
authorBrian Sullivan <briansul@microsoft.com>
Tue, 1 Aug 2017 18:23:39 +0000 (11:23 -0700)
committerBrian Sullivan <briansul@microsoft.com>
Tue, 1 Aug 2017 18:23:39 +0000 (11:23 -0700)

Trivial merge