Merge branch 'lnf' of github.com:nforrester/task-and-motion-planning-16.413
Merge branch 'master' of github.com:nforrester/task-and-motion-planning-16.413
Merged conflicts
Merge remote-tracking branch 'troy/master'