Merge remote-tracking branch 'origin/master' into feature/radius_for_convex_indicator

Author: bgoujaud