Fixes insert_id to work correctly
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Fixes insert_id to work correctly

Conflicts:
	functions.inc.php
	module.xml