Fixes: 2879174 and 2879294. Also improves a bug to C3 and Google that made it so that attachments were displaying the wrong chart type.