Merge remote branch 'upstream/master'

Conflicts:
	action/download.php
	helper/download.php