Merge remote-tracking branch 'upstream/edge' into add/probe-screen
authorJim Morris <morris@wolfman.com>
Fri, 5 Sep 2014 22:07:34 +0000 (15:07 -0700)
committerJim Morris <morris@wolfman.com>
Fri, 5 Sep 2014 22:07:34 +0000 (15:07 -0700)

Trivial merge