Merge pull request #11699 from swgillespie/local-gc-branch-merge
authorSean Gillespie <segilles@microsoft.com>
Fri, 2 Jun 2017 19:08:18 +0000 (12:08 -0700)
committerGitHub <noreply@github.com>
Fri, 2 Jun 2017 19:08:18 +0000 (12:08 -0700)
Integration from dev/local-gc into master

1  2 
build.cmd
build.sh

diff --cc build.cmd
Simple merge
diff --cc build.sh
Simple merge