Merge pull request #13987 from davidwrighton/update_from_master
authorDavid Wrighton <davidwr@microsoft.com>
Thu, 14 Sep 2017 21:39:25 +0000 (14:39 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Sep 2017 21:39:25 +0000 (14:39 -0700)
Update to latest changes from master branch


Trivial merge