Merge branch 'upstreamedge' into test/encoder-direct-step
authorJim Morris <morris@wolfman.com>
Sat, 30 Apr 2016 04:38:13 +0000 (21:38 -0700)
committerJim Morris <morris@wolfman.com>
Sat, 30 Apr 2016 04:38:13 +0000 (21:38 -0700)

Trivial merge