Merge remote-tracking branch 'upstream/master'

Conflicts:
	BotTracker.php
	README.md
	lang/es.json