Merge branch 'master' of ssh://defiant.homedns.org/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Thu, 30 Jan 2020 20:50:25 +0000 (21:50 +0100)
committerErik Andresen <erik@vontaene.de>
Thu, 30 Jan 2020 20:50:25 +0000 (21:50 +0100)

Trivial merge