Merge pull request #1016 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Tue, 30 Aug 2016 19:14:11 +0000 (12:14 -0700)
committerGitHub <noreply@github.com>
Tue, 30 Aug 2016 19:14:11 +0000 (12:14 -0700)
remove is_scara from places that it obviously is incorrect


Trivial merge