Only log marshalled content when in debug mode
Merge branch 'daley', remote-tracking branch 'origin'