Merge remote-tracking branch 'upstream/edge' into fix/inverse-transform
authorJim Morris <morris@wolfman.com>
Sat, 24 Sep 2016 22:43:56 +0000 (15:43 -0700)
committerJim Morris <morris@wolfman.com>
Sat, 24 Sep 2016 22:43:56 +0000 (15:43 -0700)

Trivial merge