Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 1 May 2017 13:18:02 +0000 (15:18 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 1 May 2017 13:18:02 +0000 (15:18 +0200)

Trivial merge