Changed logging messages for clarity.
Merge origin/master