Merge remote-tracking branch 'upstream/master'

Conflicts:
	component/admin/language/en-GB.com_jevents.ini