Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router