Merge "editstash: segregate stats by content type for more useful graphing"