Merge branch 'master' into issue9643

Conflicts:
	lib/base.php