Merge remote-tracking branch 'upstream/edge-unstable' into feature/5-axis
authorJim Morris <morris@wolfman.com>
Thu, 30 Jun 2016 19:55:16 +0000 (12:55 -0700)
committerJim Morris <morris@wolfman.com>
Thu, 30 Jun 2016 19:55:16 +0000 (12:55 -0700)

Trivial merge