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

Trivial merge