Merge origin/master

Conflicts:
	upload.php