Merge branch 'terencehill/bot_waypoints'
authorterencehill <piuntn@gmail.com>
Sat, 27 Oct 2018 10:51:37 +0000 (12:51 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 27 Oct 2018 10:51:37 +0000 (12:51 +0200)

Trivial merge