Merge remote-tracking branch 'upstream/master'
authorDavid Mason <davmason@microsoft.com>
Tue, 24 Nov 2015 19:20:29 +0000 (11:20 -0800)
committerDavid Mason <davmason@microsoft.com>
Tue, 24 Nov 2015 19:20:29 +0000 (11:20 -0800)

Trivial merge