Merge origin/master

Conflicts:
	inc/cnxbds.php