Merge remote-tracking branch 'upstream/edge' into upstreamedge
authorJim Morris <morris@wolfman.com>
Mon, 14 Sep 2015 06:48:38 +0000 (23:48 -0700)
committerJim Morris <morris@wolfman.com>
Mon, 14 Sep 2015 06:48:38 +0000 (23:48 -0700)

Trivial merge