Renamed plot_config -> plot_conf in import test
Merge branch 'master' into version-1.2