Merge "Add basic logging infrastructure for bugreports"