[Module Tag script: framework 2.11.0.39]
Changes for internals
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Changes for internals
  [Module Tag script: framework 2.11.0.39]

Conflicts:
	amp_conf/htdocs/admin/libraries/module.functions.php
	amp_conf/htdocs/admin/libraries/utility.functions.php
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  Changes for internals
  [Module Tag script: framework 2.11.0.39]