Another try to fix git issues
Merge branch 'master' into develop