merge all commits made to plot2.py on the unstable branch since last release
merge all commits made to plot2.py on the unstable branch since last release

cdsi/grima,cdsi/grima,cdsi/grima,cdsi/grima,cdsi/grima