JOJ-136.34 - Graphing copes with having no data
Merge remote-tracking branch 'origin/master'