Merge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter
authorJim Morris <morris@wolfman.com>
Fri, 11 Apr 2014 05:40:40 +0000 (22:40 -0700)
committerJim Morris <morris@wolfman.com>
Fri, 11 Apr 2014 05:40:40 +0000 (22:40 -0700)

Trivial merge