Merge remote-tracking branch 'upstream/edge' into upstreamedge
authorJim Morris <morris@wolfman.com>
Sun, 9 Aug 2015 22:39:36 +0000 (15:39 -0700)
committerJim Morris <morris@wolfman.com>
Sun, 9 Aug 2015 22:39:36 +0000 (15:39 -0700)

Trivial merge