Changed the logging messages a bit.
Merge /srv/GITROOT/Tardis