ERT-570 - Plotting performance issues
ERT-570 - Plotting performance issues
Merge remote-tracking branch 'upstream/master' into ERT-570

Conflicts:
	devel/python/python/ert_gui/tools/plot/plot_window.py
Merge pull request #423 from jepebe/ERT-570

Ert 570 Plotting performance issues