Use 'now' instead of ms if within 30 seconds of report.  Clear the report queue before quitting.
Merge remote-tracking branch 'origin/master'