Merge origin/master

Conflicts:
	appli/common/functions.php