Customised logging properties very slightly.
Merge remote-tracking branch 'origin/master'