improve logging (try and re-use postfix queue_id which makes life easier when tracing things);
Merge remote-tracking branch 'github/master'