Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Tue, 5 Sep 2017 14:32:43 +0000 (16:32 +0200)
committerErik Andresen <erik@vontaene.de>
Tue, 5 Sep 2017 14:32:43 +0000 (16:32 +0200)

Trivial merge