Remove extra debugging
Add more debug messages to ignore
Remove extra whitespace
Merge remote-tracking branch 'bot-clean/master'
Merge branch 'master' into unstable