Merge branch 'sosplugfix'
authorMike McLaughlin <mikem@microsoft.com>
Thu, 31 Mar 2016 03:36:21 +0000 (20:36 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Thu, 31 Mar 2016 03:36:21 +0000 (20:36 -0700)

Trivial merge