Merge branch 'upstreamedge' into stepticker/use-64bit-fixed-point
authorJim Morris <morris@wolfman.com>
Mon, 20 Feb 2017 22:32:35 +0000 (14:32 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 20 Feb 2017 22:32:35 +0000 (14:32 -0800)

Trivial merge