Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 29 Jul 2017 15:04:07 +0000 (17:04 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 29 Jul 2017 15:04:07 +0000 (17:04 +0200)

Trivial merge