Bug 960828 - Diagnostics. r=mccr8
Bug 965901 - Followup bustage fix. r=me CLOSED TREE