Added current thread to log messages, we can use this to verify the correct logging message is called from the correct thread
Merge branch 'ferrybig'
Merge branch 'sander'