Merge pull request #688 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Sat, 11 Apr 2015 21:41:14 +0000 (14:41 -0700)
committerMatt Ellis <matell@microsoft.com>
Sat, 11 Apr 2015 21:41:14 +0000 (14:41 -0700)
Merge changes from TFS


Trivial merge