Merge branch 'master' into develop

Remerging develop after the update of the package.json file.