Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 11 Sep 2017 15:09:11 +0000 (17:09 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 11 Sep 2017 15:09:11 +0000 (17:09 +0200)

Trivial merge