Merge remote-tracking branch 'upstream/master'
authorMike McLaughlin <mikem@microsoft.com>
Fri, 8 Apr 2016 22:23:43 +0000 (15:23 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Fri, 8 Apr 2016 22:23:43 +0000 (15:23 -0700)

Trivial merge