Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
authorJim Morris <morris@wolfman.com>
Thu, 30 Mar 2017 04:43:03 +0000 (21:43 -0700)
committerJim Morris <morris@wolfman.com>
Thu, 30 Mar 2017 04:43:03 +0000 (21:43 -0700)

Trivial merge