line_dict / text_dict for plots
Merge remote-tracking branch 'origin/master'