Merge remote-tracking branch 'upstream/master' into use_actuator

2 jobs for !119 with use_actuator in 29 minutes and 53 seconds (queued for 1 second)
latest merge request