Merge branch 'master' into develop

Conflicts:
webclient/js/functionsvars.js