Fix ping timeout recovery
Merge branch 'master' of https://github.com/JiyuuProject/JiyuuBot

Conflicts:
	main.py