Merged the custom logging that I'd added on the now-defunct debian branch post 3...