Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
ERT-478 Filtering of plot data types
Merge pull request #339 from iLoop2/filter_plot_data_type

ERT-478 Filter plot data type