Cleaned up logging even more.
Merge branch 'master' into IllyDev