Fix JS errors
Merge remote-tracking branch 'Finnian/master'

Conflicts:
	downloads.php
Merge remote-tracking branch 'Finnian/master'

Conflicts:
	downloads.php
Merge remote-tracking branch 'Finnian/master'

Conflicts:
	downloads.php