Merge pull request #14000 from davidwrighton/merge_more_from_master
authorDavid Wrighton <davidwr@microsoft.com>
Thu, 14 Sep 2017 22:35:58 +0000 (15:35 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Sep 2017 22:35:58 +0000 (15:35 -0700)
Actually merge to completely up to date with master


Trivial merge