Fix an issue with Github
Merge branch 'master' into develop