Merge remote-tracking branch 'upstream/edge' into feature/e-endstop
authorJim Morris <morris@wolfman.com>
Sun, 9 Oct 2016 05:19:51 +0000 (22:19 -0700)
committerJim Morris <morris@wolfman.com>
Sun, 9 Oct 2016 05:19:51 +0000 (22:19 -0700)

Trivial merge