ChangeLog:
Edited classes: CommandListener, TorchListener
Edited Files: none
Merge remote-tracking branch 'origin/master'