Merge remote-tracking branch 'origin/master' into truth_reconstruction

64 jobs for truth_reconstruction in 22 minutes and 50 seconds (queued for 4 seconds)