Merge remote-tracking branch 'upstream/master'
authorMike McLaughlin <mikem@microsoft.com>
Sat, 9 Apr 2016 18:26:05 +0000 (11:26 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Sat, 9 Apr 2016 18:26:05 +0000 (11:26 -0700)

Trivial merge