v 3.9
Merge branch 'master' into update/3.9

Conflicts:
	includes/classes.php