Fix bug#4006
Merge commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34'

Conflicts:
	import.php