Merge branch 'master', remote-tracking branch 'origin'
import missing plt module in functional_vs_friction_plot