Merge branch 'feature/more-estop-config' into stepticker/use-64bit-fixed-point
authorJim Morris <morris@wolfman.com>
Thu, 30 Mar 2017 03:29:10 +0000 (20:29 -0700)
committerJim Morris <morris@wolfman.com>
Thu, 30 Mar 2017 03:29:10 +0000 (20:29 -0700)

Trivial merge