Merge remote-tracking branch 'upstream/master' into dacglobals1
authorMike McLaughlin <mikem@microsoft.com>
Mon, 9 Mar 2015 23:06:20 +0000 (16:06 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Mon, 9 Mar 2015 23:06:20 +0000 (16:06 -0700)

Trivial merge