Merge pull request #2316 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Sat, 12 Dec 2015 01:38:01 +0000 (17:38 -0800)
committerBrian Sullivan <briansul@microsoft.com>
Sat, 12 Dec 2015 01:38:01 +0000 (17:38 -0800)
Merge changes from TFS


Trivial merge