Merge remote-tracking branch 'upstream/edge' into add/probe-screen
authorJim Morris <morris@wolfman.com>
Sat, 23 Aug 2014 05:21:03 +0000 (22:21 -0700)
committerJim Morris <morris@wolfman.com>
Sat, 23 Aug 2014 05:21:03 +0000 (22:21 -0700)

Trivial merge