Merge master into develop#6962

omichel merged 2 commits into

developcyberbotics/webots:developfrom

sync-master-b470c0f01cyberbotics/webots:sync-master-b470c0f01Copy head branch name to clipboard