Merge branch 'dev-PlotCombinedMap_no_triangle_mlmap' into 'master'

Bug fix in mlmap when upper triangle is not required

See merge request !184
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds