Merge remote-tracking branch 'upstream/master' into soscommand1
authorMike McLaughlin <mikem@microsoft.com>
Fri, 20 Feb 2015 02:35:46 +0000 (18:35 -0800)
committerMike McLaughlin <mikem@microsoft.com>
Fri, 20 Feb 2015 02:35:46 +0000 (18:35 -0800)

Trivial merge