Merge origin/master

Conflicts:
	upload.php
Merge origin/master