Testing Merge
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Testing Merge

Conflicts:
	functions.inc.php