TEMP: logging stuff for rewrite
TEMP - other rewrite logging
TEMP - fix rewrite logging
TEMP - fix rewrite logging 2
TEMP - fix rewrite logging 3
finish off temp changes to rewrites
Merge branch 'master' into develop