fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	script/c54366836.lua
prevent infinite loop
fix
Merge pull request #609 from sidschingis/master

fix