Merge pull request #1080 from mikem8361/cleanup
authorMike McLaughlin <mikem@microsoft.com>
Mon, 1 Jun 2015 23:30:51 +0000 (16:30 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Mon, 1 Jun 2015 23:30:51 +0000 (16:30 -0700)
General SOS support cleanup


Trivial merge