Improved content logging.
Merge branch 'feature/issue-38-improved-content-logging' into develop