Change the if-else statements into a switch in ToxService.
Merge remote-tracking branch 'upstream/master'
Merge branch 'Corly-master'